Revision: bazaar--cached--1--patch-7
Archive: aaron.bentley@utoronto.ca--baz
Creator: Aaron Bentley <aaron.bentley@utoronto.ca>
Date: Mon Jan  3 22:48:59 EST 2005
Standard-date: 2005-01-04 03:48:59 GMT
Renamed-files: libarch/star-merge.c libarch/merge.c
    libarch/star-merge.h libarch/merge.h
Modified-files: baz/baz.c commands/apply-changeset.c
    commands/lint.c commands/merge.c commands/status.c
    libarch/merge.c libarch/my.c libarch/proj-tree-lint.c
    libarch/proj-tree-lint.h po/etc/messages.pot
    tests/test-changes.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-7
    rob.weir@canonical.com--2004-public/baz--bug4889--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-2
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-51
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-52
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-53
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-54
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-55
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-56
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-57
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-58
    thelove@canonical.com/bazaar--devo--1.1--patch-64
    thelove@canonical.com/bazaar--devo--1.1--patch-65
    thelove@canonical.com/bazaar--devo--1.1--patch-66
    thelove@canonical.com/bazaar--devo--1.1--patch-67
    thelove@canonical.com/bazaar--devo--1.1--patch-68
    thelove@canonical.com/bazaar--devo--1.1--patch-69
Summary: Merge (Canonical.com Patch Queue Manager)
Keywords: 

Patches applied:
 * thelove@canonical.com/bazaar--devo--1.1--patch-68
 * tweak lints output for adhoc scripting
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-51
   update messages.pot, and fix typo in apply-changeset.c

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-52
   merge from rf

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-53
   rename libarch/star-merge to libarch/merge

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-54
   fix tree_version leak in merge

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-55
   fix leak in i18n setup

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-56
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-57
   remove lint chatter that interferes with piping


 * thelove@canonical.com/bazaar--devo--1.1--patch-69
 * refactor the inventory linting and status generation to allow separate invocation, use this to allow status to lint before doing changes, but to still show the lint output after the changes. Fixes: bug #4581
Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-58
   refactor the inventory linting and status generation to allow separate invocation, use this to allow status to lint before doing changes, but to still show the lint output after the changes. Fixes: bug #4581

